SECURITY PATCH: import una 131229 fix2