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