merge of analytic fixes