Re #6924 Add remote sub prep