Merge "Update comment per review feedback" into qt-dev