properly fixed notices
Merge branch 'develop' into refresh