Merge current develop branch into Stable for 0.5.4