Do not set default value if the value has already been set (even if it was set to nil)
updates version
Merge branch 'release/v1.1.1' into develop

* release/v1.1.1:
  updates version