Port last modifications from sample-bootstrap-templates