Revert "bug fixing and new features added - preparation to 2.4 or 2.3.2 - to decide"

This reverts commit ec5265d8d95834320a5fa3a30c6430fd98afabcb.