same changes on iOS
Merge branch 'DA-422' into unstable

* DA-422:
  same changes on iOS