; Merge: fixes and updates to scroll margin (Bug#5718)