*** DO NOT MERGE ***   part of Gem update project.