Merge "Simplify prepare and set semantics (comments only)" into jb-mr1-dev