update for topic-A branch