Merge branch '530_federator_user_info_overwrite_fix' into 'develop'