Merge "Restore RSTest functionality (char bug is fixed)." into jb-mr1-dev