Merging v2.5 stable