Merge "Prevent busy loop"