refactor const based notice to config based
Merge remote-tracking branch 'origin/master'