Merge branch 'develop'
Remove a conflict in CT client file