Master to 1.x testing pull request

Test it please.