Resolve SPOT-1654, SPOT-1631