Merge "Add more SP_ constants"