EMAILPLT-114 Updates from github suggestions