Reset scale when restoring block state
Update references nested in other blocks
Merge pull request #397 from LLK/reset-block-scale

Reset scale when restoring block state
Merge pull request #398 from LLK/update-nested-references

Update references nested in other blocks
Merge tag 'v421'