Beta Potion 2.1

Bug Fixes
Merge remote-tracking branch 'origin/ug-beta_potions'