We previously changed block behavior to prefer includes over parent blocks, which broke inheritence in nested blocks. Fixes #15926