Working on iss53
Fixed the HotFix problem
Finished iss53
Fixed the conflict