Merge "NULL should not be const for RS."