bootstrap updates including issue #1116