Master reset from 40dcaf6 to 0e5302b