Latest updates plus PyCharm settings
Merge upstream