Backport of DBS3 transition fixes.
Merge pull request #2326 from vadler/53X-dbs3ApiTransition

53X DBS3 API transition