Merge "Per "designer" request:" into jb-mr2-dev