Merge "Fix issue with decorator 5.0.0"