Merge "Remove ActAsNullConstant"