Use null polling to extend timeout
Revert "Blur after changed"

This reverts commit 7cc7e831498824f7f13979d7e62a4e1e123eeb11.
Implement 2 stage clone