Merge branch 'hotfix/meta'
rgsoc ticket
Merge branch 'hotfix/team' into develop