Revert "Merge branch 'feature_e' into development"

This reverts commit 3420d8344b065817b25116c4ea75961ab4259b56, reversing
changes made to a354e85c9a459864d8f418607e344aa9ffefdb37.