Merge pull request #3105 from nrwahl2/nrwahl2-T185_prep
libcib, based, various: Minor fixes and improvements