Merge "Fix sign extension issues"