Requires hive!1191 to be merged first.
See hive!1191 for details on how changes in this merge request work.