Release/0.25 cont