Merge branch 'hotfix/BVV-504'
Merge branch 'develop'
Merge branch 'feature/uitpas_beheer' into release/3.x