Release-1.3.6-Hotfix-2