Merged app-clearsync code [tracker #1681]