Merge branch 'il/remote-updates'