Merge "RS char bug repro case" into jb-mr1-dev