WELD-1588: Finalizing