Adapt to this MR in core.
created merge request !3 (merged) to address this issue
mentioned in merge request !3 (merged)
closed via merge request !3 (merged)
mentioned in commit 935a685b