APOLLO-3870 Updated sageId generation