Re #6924 Fix cluster submission