Merge "Inline long shift code"