FELIX-4290 Commit a slightly simpler fix than Pierre proposed and his test, moved into the existing ComponentFactory test class