Feature #4615

Do not forget to check out pull request on Components too...