re #10550 improvements and python enabling