Merge remote branch 'origin/new/bug_10018_10061_deb_pkg_fixes'