include recent changes for 1.3.6 version