Release/0.24 cont