(1) + (3) was decided for #362.This implements (3)