Cleaning up.
Merge branch 'dbxAdv' into testing