Merge branch 'post-bold2' into avoid-domino