FIX OA-3527.8
FIX OA-3527.9-11