Merge "Ignore overwritable image changeness during utc test" into devel/master