Merge branch 'backport-fix-installscripts-gen' into fix-installscripts-gen