Re #7405 Fix submission
Merge branch 'feature/7405_fix_remote_sub' into develop