Merge branch 'topic/nyd2'