Trying to balance dynamics merging requirements
Merge fixes