Merge branch 'ticket/9781' into ticket/9781-2