Revert "feature_e rge remote-tracking branch 'origin/development' into feature_e"

This reverts commit 935c3934a5a03f64c0db7f8fa90752bf470fae84, reversing
changes made to 6d6486661f7f5a180fc98c475a02e11dc48759e0.
fixed
Merge branch 'release' into feature_e
Revert "Revert "feature_e rge remote-tracking branch 'origin/development' into feature_e""

This reverts commit ef5a30c1408c66eb3813bc55ea0348793c9bb60d.
fixed the bug