TAP5-2225: fix and clean up implementation
1 file changed