Merge branch 'rm-scripts'