Should fix #1265
Should fix other issues on start.
Auto generated commit for version 3.1.132.308-Test
Auto generated commit for version 3.1.133.308