one last merger from the v1.5 code base