Merge changes Icdf88bc3,I368e905a

* changes:
  Improve package version logic
  Fixes for getting package version