Merge "move out ironic exception from common import"