Merged in changes from v3.0

Merged in multiple recent changes from v3.0.