refs #SUPPORT-2