Merge branch 'nikwen-german_push'