Merge branch 'master' into ini_cache

Accommodate to @e9b5e7e