upstream galaxy commonplace modifications