Daniel for hgrc
Merged with rmm5t upstream