Definitely not as part of this PR.  Not sure how much later this will get addressed, but it's in JIRA as LMS-1256.