Pull request for merging dev into staging for for version 0.5.3