Merged Crystal/Goal with master