1212-1528

Joan's changes

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