Fix #1084 and release to rc3.5.1