DAM-313: Updating to latest gems