[Echobase-commits] 01/02: Merge branch 'release/4.2-rc1' into develop