Core merge #625