Merge "Fix the compiler error for the ternary operator, caused by Eigen rebase."