plus couple method reorganizations (cherry picked from commit 0e22d61d4a85bc8d5080474a007ba2fc72842af6)