commits: dba699fbfe333a236fd25feef034233d1a078b5f, d841ca22a4aabc5f36e21b7270eb5089683dfd8f, dc22dc67a0a77afc4a8d76d662b615b52b6c3b96, y 7f69f7b1398d0cbdb1e19febbd6dee328481f50b have been merged from FNOJ