am 68cf75c5: Merge "Per "designer" request:" into jb-mr2-dev

* commit '68cf75c58ecc3fbf3a24189443490608efcc9caf':
  Per "designer" request: