Rebased to 13.6.0_RELEASE