overlapping
(cherry picked from commit 743ced7)