Merge user_name specific changes from master