Post 1.3.6 release a2.5ons done