PR sent: https://github.com/sysapps/device-capabilities/pull/22