Resolved JIRA issues IOT-871 and IOT-892.