Merge pull request #788 from isartcanyameres/release/0.25

Release/0.25
Merge branch 'tmp/unsecured-ofertie-ns' into release/0.25.1
Bump version to 0.25.1
Merge pull request #795 from isartcanyameres/release/0.25.1

Release/0.25.1
Solve conflicts using release version 0.26.