Waiting on 4.6.z stream for this to merge marking upcoming sprint
will merge this next sprint
waiting for cherry pick approval, moving to upcoming sprint
*** This bug has been marked as a duplicate of bug 1897766 ***