Merge branch 'lkmm-dev.2021.07.20a' into HEAD

lkmm-dev.2021.07.20a: LKMM development branch.