Merge "Fix issue using broken image" into devel/master