this commit serves as solution to the merge conflict between f/user_status_change_processor and develop