1215-1032

merging in some other definitions

Signed-off-by: Steve Lombardi <steve.lombardi@pb.com>