Re #9919 Added existing files to the Test
Re #9919 Fix merge with develop