Merge/3.0.x into 3.0.x juno

merging 3.0.x into 3.0.x-juno.