FIX OA-3527.3
FIX OA-3527.5
FIX OA-3527.6