manual merge from old dev environment
statistics