master: cfdc6b2f684082b41ed25a4559aac44cce7b62e1 Add base_path config value back