Changed to Calclavia-Core 1.6.4 branch