Copied changes from 3.0.0 to 3.0.1