PMO-2298: fixed aad/aal and special cases of loss carried forward situations