Version history 1.3.5.0
Merge 1.3.5.0 to master