Merge remote-tracking branch 'upstream/edge' into use-pendsv-handler-for-ticker