SZ-108: incremental commit: go back to standard BlocksKit as it is being maintained