Release mer-3.8.1-3
Resolve merge conflict