Merge remote-tracking branch 'origin/saveclassifier-cleanup'