Simplify code + Allow more generic attr children + remove prefix Upstream-commit: 9fd44cb5693452845c966f6c2a5b4f716f7a9c2c Component: engine