master
<!-- TODO decide if we really want to alter the session aggregation behavior in such a non-BC way -->