test (cherry picked from commit ac1c26d)