[fr] 5d061934, #2164, #2165, #2166