Merge remote-tracking branch 'origin/master' into features/improved_installer