Merge branch 'hotfix/hotfix'
Query fix
Link id
Merge branch 'hotfix/hotfix' into develop