5.2.2-10-ga18ad2f
All previous changes in one commit