A5-1-9
: Improve performance, address duplication
#857
Merged
A5-1-9
: Improve performance, address duplication
#857