Ignoring changes on the datareporting. branch and some other minor improvements.