Few updates for 5.4.0