Log error if needed
Merge branch 'release'