Merge changes from topic "K-1"