Merges jb-heap -> master
Rebased version of !28 + added some valuable info from MR to commit message.
No dependencies set.
The note is not visible to the blocked user.
Merges jb-heap -> master
Rebased version of !28 + added some valuable info from MR to commit message.