Merge pull request #12909 from remitamine/raw-sub