Make product 2 compatiable with core submodule change.