merging cherry pick from dynamic-js branch
Merge pull request #2596 from ten24/feature-client-side-rbkey

merging cherry pick from dynamic-js branch