Updated from commit cfb7fa99ac558f0adefb31522514326f75b5b394.