Merge branch 'PR3354'