Merge changes from @erran to set values on objects