QAdvis-13485 w WM

QAdvis-13485 w WM