Resolve "Problems with dirty fields tracker while using (get_or_)create" Closes #392 See merge request !503