Merge "fix comments OPTFRA-242, edit release notes"