Pull fixes for 590/592