Merge branch 'master' into ticket/34