CDB-2031 #fixes Fixes nokia thumb
Merge CDB-2031 into release/2.11.1