[Observe-commits] 39/80: remerge from develop :(