27.12 changes
Merge pull request #73 from Dolgovec/patch-85

27.12 changes