merge: cleanup, branch freeze pending integration.