Version 4.0.0 RC7

Changed adapter behaviour, minor fixes