Resolution should be respected.
Merge branch 'dev'