Revert "warning-fixes"

This reverts commit 79b9dd396f585ea6761731f679aecfa9aa44e5d7.
Merge branch 'master' into develop