Merge current develop branch into Stable for 1.5.11