Merge "Update to new notice support." into idea133
 Auto-merge: b22dbfb

* commit 'b22dbfb00380ef5b4dfd5b9ca72c4b408878ae87':
  Update to new notice support.