Merge branch 'client-angular4'