completed JIRA ASGARD-1281