Seems like some work did not make it into master
Clone fixed
Merge branch 'hotfix-clone-bpfd-229'