Fixes-for-root6-v6-02-05