Closes #342 (closed)
Related Infrastructure MR: freedesktop-sdk/infrastructure/infrastructure!22 (merged)