DEV-65455 - Android users experience errors in Tablomat
Merge remote-tracking branch 'origin/develop' into develop