Fix structure after bad commit.
Merge branch 'develop'