Few updates from 4.2.0