[Commits] 5680d3f: Merge branch 'bb-10.3-mdev12387' into 10.4