AT-50300553-more-gem-improvements