Fix null include
Merge branch 'develop'