Merge baseutils branch with baseutils master