Commit patch to 'cas' module from issue #2057881.