Fix for SCI-1414, and the correct behavior of some export actions