Merge "Cleanup Flag definitions and moves lib to fw/b" into main