am 748f6c85: Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev

* commit '748f6c854822c01ebf805202935037300d351104':
  Doc change: New class on avoiding save conflicts