Fix broken DECEFR
Update version
Merge branch 'declocator' into develop
Merge branch 'develop'