Fix for potential crash/freeze
Auto generated commit for version 3.1.19.102