Merge changes from topic "istanbul-support"