Amendments following translation
Merge