// Backward compatibilities switched on master