[IMP] make possible to make a better inherit on the amendment method
Merge branch 'master' into 8.0