Merge pull request #4481 from ralfhandl/main-sync-scripts-from-dev

Merge pull request #4481 from ralfhandl/main-sync-scripts-from-dev #289