@klaus - not tested yet as first must merge Wendelin side MR (wendelin!60 (merged))
This will create a new commit in order to revert the existing changes.
