Merge branch 'test/updating-with-empty-value' into develop