Only push owner, when it is set and modified + refactoring (OMS-577)