Merge proposals dependent on lp://staging/~brendan-donegan/checkbox-certification/lucid_core_backport_mkII

1. lucid_core_backport_mkII
2. Dependent merge proposals