Bug 18071: (QA Followup) - Add additional feedback and expand commit option