Integrating the latest sufia projecthydra/sufia/commit/0fe9e93ead0f