commit identified by 17a5bbb9a6e058494f5d0a8e660362da6668b1e2 was merged from FNOJ