GEP-53 Multiple fixes and commits