merge fd2fda6d362c3e6d914c34bc187977abfb654d4c commit from FNOJ