Yep, this is done this way for PSS support (which is the last of the 3 PRs).