Sync to PS 1.6.0.6 default-bootstrap