bring kabam-master closer to upstream master