Release 3.1 CR/fixes