3.0.2 -> 3.0.3
[MERGE] With core