master: aefdf181829850cc0174cac9f67fe16583409a32 basepath issue-rev