7487: LeanBoxCreator
7489: refactor