Fix location of insert
Merge branch 'dividers' into local-develop