am a777a86f: Merge "Simplification (A2)" into jb-mr1-dev

* commit 'a777a86f4b311ccdf1443faf0d1759e445ef138e':
  Simplification (A2)