merged changes preserving hub flags