AUI-1161 - Optimize the solution