Merge latest from datacleaner/AnalyzerBeans