follow up to #10868 This PR changes the implementation to match the updated example. Before submitting the PR make sure the following are checked: The PR relates to only one subject with a clear...