ENG-5540 changes in python