adapting to the release of factory 4.0.0, part 6