commit 8ea0497cf9cde2f1640f025e03620d957f014fb0 was merged from FNOJ