Commiting initial support for NICT/NIST forking