Merges v3.0.3 branch