Merge branch 'hotfix/referer_id_fix'
Merge branch 'hotfix/line_length_under_contact_class' into stage