Re #8365 Added test file
Re #8365 Restored from master.
Re #8365 Test and cleaning.