Merge branch '582_federation_retirement_optimization' into 'develop'