in process of pushing onto release and master branches before 8.1
is released

(cherry picked from commit 24f4ee6f)