Merge branch 'hinic-BugFixes'