Merge branch 'optimisation/deactivated-subquery' into 'develop'