5.2.2-16-gfd4d1bc
All previous changes in one commit