V15.0.4 Improved incremental state empty check