commit identified by 0e9422a33c9cbc38012c2fac5946de5c89674ca7 was merged from FNOJ branch