Merge branch '2021-04-07-fs-updates'

- JFFS2 updates