3.1 Final Changes

Signed-off-by: Matt White <matthew.white@fclonline.com>