Merge remote-tracking branch 'openntf/master' into work2