Merge branch 'fix-post-inserts-167' into next