Backport from TNG live editing template