Fix production error 'undefined method leader_in?' checking of users permission
Fix conflicts after merging MH-673 to dev