Merge/3.0.x into 3.0.x juno

merge release/3.0.x into release/3.0.x-juno