align with good part of post-bold branch (WIP isolation)