Merge branch 'release/Versie_2.0.0'
FIX
Merge branch 'hotfix/UPGRADE' into development