[Echobase-commits] 02/03: Merge branch 'release/4.2-rc3' into develop