Update for Nightly 27

m-c github rev 530dbc4e067a0b6276