LPS-52037 Keep the default hierarchy upon site creation
LPS-52037 Update tests
LPS-52037 SF
LPS-52037 SF