Adapting to this MR in core.
created merge request !21 (merged) to address this issue
mentioned in merge request !21 (merged)
closed with merge request !21 (merged)
mentioned in commit 47c13471