3.1.0 changes

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

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