first batch of changes towards 5.4