Feature #4835

I implemented the Feature #4835, maintaining compatibility with previous versions.