Merge "Revert "Refine divider behavior"" into nyc-dev