Merge branch 'topic/new_test'