Merge "Adjust FAQ." into jb-mr1-dev