Merge "Resource source subfiles fix"