merge branch with added Create Topic feature