Merge "Suppress 'property must be initialized' warning" into main