VB-1863

Core updates for April release.

Signed-off-by: Gregory Davis <gdavis2@nd.edu>