Different merges from develop (doc,debian,contrib,manager)