[rfpkg/f29] (8 commits) ...minor changes