Added changes needed by resolution of #7730