Syncing fork with v3.0

Syncing fork with v3.0