#GT-893: refactored