disable base64 for now
Merge branch 'master' into class-diag