Alveo merge code heap size fix

Merged Tobias Winchen requested to merge alveo_merge_code_heap_size_fix into devel

Merge request reports