Merge branch 'master' into PROT-9-webservice