Keep descriptor in the view show option for backwards compatibility.
Merge branch 'develop' of https://github.com/Saleslogix/argos-sdk into develop