Merge branch 'trunk', remote-tracking branch 'origin/feature/nested-blocks'