Merge branch '2022-06-23-important-fixes'