Merge "Fix: small definition missing"