in develop
in R1.1
Merge from develop for v1.1