Merge all updates, bugfixes, CSP fixes, and stable key from Code APP
