Merge "Simplify whitebox/manager"