MOB-1886

**DO NOT MERGE**

Proposal of fixing MOB-1886 defect.