agt-gen: Corrected: https://skl-tp.atlassian.net/browse/SERVICE-47