merge 3.2.8 from master and apply tweaks to root script