Fix for notice
Merge branch 'hotfix/notice'