* LEGO: Merge pull request 11652 LEGO: Merge pull request 11652 * LEGO: Merge pull request 11646 LEGO: Merge pull request 11646 Co-authored-by: csigs <csigs@users.noreply.github.com>