Port fix for update sections from v2.x.x