fix: v0.8 review and polish#186

jaypaik merged 2 commits intodeveloperc6900/reference-implementation:developfrom

09-30-fix_v0.8_review_and_polisherc6900/reference-implementation:09-30-fix_v0.8_review_and_polishCopy head branch name to clipboard