This resolves bug 2896 Signed-off-by: Ray Vine <ray-v@inbox.lv> (cherry picked from commit 02033dcf36)
02033dcf36