Merge "Fixed test cases after changes in ResourceImage" into devel/master