Reverted previous commit [7781] because there was an error which created circulare dependencies between some modules. See ticket #874