Fixing Moz warnings
Merge branch 'development' into integration