Moved these to JIRA (RN-4 and RN-5)