*** DO NOT MERGE ***  Part of Gem update project ***