Updated to rebased core branch