Lastest master merged into web version

Lastest master merged into web version