Issue 5610 missing import in master 2 5