Cherrypicked Adrians commit into split rgb