Hart. add #671 changes to overridden /my template