Move extends to top.
Merge branch 'dev'