Moved the OnPolling trigger to inside the PrepareRequest handler

#1776