Improvements WM | Quartis R2018-1