LL-423
* merging this fix from master to this branch