Merge branch 'db/6255' into db/6255-6277