Merge "Take care of remaining denials." into jb-mr2-dev