[3.6.x] Users promise fixes 3.6.x

@vohi: Some 3.6.x cherry-picks with conflicts pre-resolved!