Merge branch '2020-10-30-misc-changes'

- Additional log improvements
- SPI flash environment improvements