Merge "Fix a off-by-one bug" into experimental