Adopt project_variable_path instead of namespace_project_variable_path. (Resolve confilct from master)