Rfi-2510329 - Drawing Management Solution