Some changes by charles
Merge commit '2d59adc5569ec14a5bfe4bc239f693d9c5dd4d29' into develop