Active dev

Request to merge upgrade fix from active dev into master