Merge tag 'sparks-2.8.12' into develop

2.8.12
Same fix in other places.
bump version in __init__.py
Merge branch 'release/2.8.13'