Stable/2.5 forward port to Master

Porting bugfixes up to Master