Merge "Be quiet!" into jb-mr1.1-dev