Bringing Pavel changes to my fork