Merge "Refactorying code related to broken image" into devel/master