Reintegration of the red list branch into trunk