Merged remaining code from 3.3.0