Changes from 3.12 to 4.0.3 branch

Last updated