Merge release/3.0 to release/4.0