Merge branch 'il/remote-fd-ext' into next