Merge "Minor updates in ResourceResolutionComponent class"