Merge branches 'dev-bhushan' and 'dev-bhushan' of https://github.com/rubydog/iap into dev-bhushan