Merge branch 'cn/thin-push-capability'