Updated to comply 3.0.12RC3 changes.