Merge "Ignore IllegalStateException" into main