Fix for the "pull storm" phenomenon in HA
Merge remote-tracking branch 'origin/master'