6669# Fix support for HA collectors in glidein_off
6671# Protect secuity_obj state in case of an exception
6669# Fix error handling
Merge remote-tracking branch 'origin/v3/6669' into branch_v3_2
Merge remote-tracking branch 'origin/v3/6671' into branch_v3_2
Merge branch 'branch_v3_2'