stretch
Merge branch 'DA-371' into unstable

* DA-371:
  stretch