[master] Move eval code to Core