Merge "Fixed canceling fill request caused removal current session"