Fixed build problem with missing etc.
Merge branch 'test' into dev