#5537 - Fix bulk edit overlap, bulkedit improvements
Merge pull request #6811 from bryceadams/patch-5537

#5537 - Fix bulk edit overlap, bulkedit improvements