Update application
Merge branch 'devel' locally.