Merge "DR_SubResource-remove comment-out lines"