3.1 Branch into master for SS3.1 compatibility