Merge "Fix: line slop shouldn't always increase / decrease by one line" into mnc-dev