develop branch on ting-client for this feature