Implementation of hive#406

Konrad Botorrequested to merge
hive-406-2 into develop

Implementation of hive#406 (closed)

Requires haf!216 (merged)

Edited by Konrad Botor

Merge request reports