3.2 changes

Signed-off-by: Matt White <matt@londc.com>