CC: https://github.com/fission/fission/issues/1663
CC: fission/fission#1663