BRANCH 4.3: minor alignment updates and more ports to bootstrap