Merge branch '6690-serial_after_insert' into 'develop'

Update the serial after the actual insert, #6690

Closes #6690

See merge request !1883