Squashed 'scripts/' changes from 1b0af21..f70ba1a

f70ba1a Merge commit '6fc8355dfcaff718f4d4da00225fc7e81f02a6c8'
6fc8355 Squashed 'scripts/' changes from f8f5f23..1b0af21

git-subtree-dir: scripts
git-subtree-split: f70ba1a95e5015dffbe697a549335e64e87b50f3
Merge commit '8ec9d6a68ccfd88448d9225eabae601729a206f5'