Re: [pull] -fixes for 3.6