*8787* Fix wait for Superfish init
*8787* Fix logout
Add missing constant import
*8787* Improve robustness of data build suite