Revert "Revert "Merge branch 'management-fixes'""

This reverts commit f27fd89beb91e8be5fcfcc2cd0d21cf869afab3a.