Merge branch 'issue-1391-ljv'

Update Issue 1391
Status: FixPending