Merge "Some divider handling fixes" into nyc-dev