sync with v1.5rc3