Merge remote-tracking branch 'origin/development' into 253-min-320-opening-project-without-permission