Merge "Calculate the correct HUN position, while dragging down the shade" into main