2.0.4

Fixed SC6 build
Fixed test compilation issue