adding an optional label/identifier to the e-mail notification
fixing develop merge conflicts