Updated comma-first with changes on master