diff --git a/aptos-move/framework/aptos-framework/sources/configs/features.move b/aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib/sources/configs/features.move
similarity index 76%
rename from aptos-move/framework/aptos-framework/sources/configs/features.move
rename to aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib/sources/configs/features.move
index 6cc54ffac1ea8..fb58417f146da 100644
--- a/aptos-move/framework/aptos-framework/sources/configs/features.move
+++ b/aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib/sources/configs/features.move
@@ -1,6 +1,8 @@
-/// Maintains feature flags.
-module aptos_framework::features {
-    use aptos_framework::system_addresses;
+/// Defines feature flags for Aptos. Those are used in Aptos specific implementations of features in
+/// the Move stdlib, the Aptos stdlib, and the Aptos framework.
+module std::features {
+    use std::error;
+    use std::signer;
     use std::vector;
 
     // ============================================================================================
@@ -20,8 +22,10 @@ module aptos_framework::features {
     //   behavior in native code, and the behavior with or without the feature need to be preserved
     //   for playback.
     //
-    // Features should be grouped along components. Their name should start with the module or
-    // component name they are associated with.
+    // Note that removing a feature flag still requires the function which tests for the feature
+    // (like `code_dependency_check_enabled` below) to stay around for compatibility reasons, as it
+    // is a public function. However, once the feature flag is disabled, those functions can constantly
+    // return true.
 
 
     // --------------------------------------------------------------------------------------------
@@ -31,35 +35,37 @@ module aptos_framework::features {
     /// available. This is needed because of introduction of a new native function.
     /// Lifetime: transient
     const CODE_DEPENDENCY_CHECK: u64 = 1;
-    public(friend) fun code_dependency_check_enabled(): bool acquires Features {
+    public fun code_dependency_check_enabled(): bool acquires Features {
         is_enabled(CODE_DEPENDENCY_CHECK)
     }
-    friend aptos_framework::code;
 
     /// Whether during upgrade compatibility checking, friend functions should be treated similar like
     /// private functions.
     /// Lifetime: ephemeral
     const TREAT_FRIEND_AS_PRIVATE: u64 = 2;
-    public(friend) fun treat_friend_as_private(): bool acquires Features {
+    public fun treat_friend_as_private(): bool acquires Features {
         is_enabled(TREAT_FRIEND_AS_PRIVATE)
     }
 
     // ============================================================================================
-    // Feature Flag  Management
+    // Feature Flag Implementation
+
+    /// The provided signer has not a framework address.
+    const EFRAMEWORK_SIGNER_NEEDED: u64 = 1;
 
     /// The enabled features, represented by a bitset stored on chain.
     struct Features has key {
         features: vector<u8>,
     }
 
-    /// Function to enable and disable features. Can only be called by @aptos_framework.
-    public fun change_feature_flags(aptos_framework: &signer, enable: vector<u64>, disable: vector<u64>)
+    /// Function to enable and disable features. Can only be called by a signer of @std.
+    public fun change_feature_flags(framework: &signer, enable: vector<u64>, disable: vector<u64>)
     acquires Features {
-        system_addresses::assert_aptos_framework(aptos_framework);
-        if (!exists<Features>(@aptos_framework)) {
-            move_to<Features>(aptos_framework, Features{features: vector[]})
+        assert!(signer::address_of(framework) == @std, error::permission_denied(EFRAMEWORK_SIGNER_NEEDED));
+        if (!exists<Features>(@std)) {
+            move_to<Features>(framework, Features{features: vector[]})
         };
-        let features = &mut borrow_global_mut<Features>(@aptos_framework).features;
+        let features = &mut borrow_global_mut<Features>(@std).features;
         let i = 0;
         let n = vector::length(&enable);
         while (i < n) {
@@ -76,8 +82,8 @@ module aptos_framework::features {
 
     /// Check whether the feature is enabled.
     fun is_enabled(feature: u64): bool acquires Features {
-        exists<Features>(@aptos_framework) &&
-        contains(&borrow_global<Features>(@aptos_framework).features, feature)
+        exists<Features>(@std) &&
+        contains(&borrow_global<Features>(@std).features, feature)
     }
 
     /// Helper to include or exclude a feature flag.
@@ -120,7 +126,7 @@ module aptos_framework::features {
         assert!(contains(&features, 23), 3);
     }
 
-    #[test(fx = @aptos_framework)]
+    #[test(fx = @std)]
     fun test_change_feature_txn(fx: signer) acquires Features {
         change_feature_flags(&fx, vector[1, 9, 23], vector[]);
         assert!(is_enabled(1), 1);
diff --git a/aptos-move/framework/aptos-framework/sources/configs/features.spec.move b/aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib/sources/configs/features.spec.move
similarity index 73%
rename from aptos-move/framework/aptos-framework/sources/configs/features.spec.move
rename to aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib/sources/configs/features.spec.move
index 9de146f905539..c5dd8e17f50bb 100644
--- a/aptos-move/framework/aptos-framework/sources/configs/features.spec.move
+++ b/aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib/sources/configs/features.spec.move
@@ -1,12 +1,12 @@
 /// Maintains feature flags.
-spec aptos_framework::features {
+spec std::features {
     spec module {
         pragma verify = false;
     }
 
     spec change_feature_flags {
         pragma opaque = true;
-        modifies global<Features>(@aptos_framework);
+        modifies global<Features>(@std);
     }
 
     spec code_dependency_check_enabled {
diff --git a/aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib_incompat/sources/configs/features.move b/aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib_incompat/sources/configs/features.move
new file mode 100644
index 0000000000000..fb58417f146da
--- /dev/null
+++ b/aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib_incompat/sources/configs/features.move
@@ -0,0 +1,141 @@
+/// Defines feature flags for Aptos. Those are used in Aptos specific implementations of features in
+/// the Move stdlib, the Aptos stdlib, and the Aptos framework.
+module std::features {
+    use std::error;
+    use std::signer;
+    use std::vector;
+
+    // ============================================================================================
+    // Feature Flag Definitions
+
+    // Each feature flag should come with documentation which justifies the need of the flag.
+    // Introduction of a new feature flag requires approval of framework owners. Be frugal when
+    // introducing new feature flags, as too many can make it hard to understand the code.
+    //
+    // Each feature flag should come with a specification of a lifetime:
+    //
+    // - a *transient* feature flag is only needed until a related code rollout has happened. This
+    //   is typically associated with the introduction of new native Move functions, and is only used
+    //   from Move code. The owner of this feature is obliged to remove it once this can be done.
+    //
+    // - an *ephemeral* feature flag is required to stay around forever. Typically, those flags guard
+    //   behavior in native code, and the behavior with or without the feature need to be preserved
+    //   for playback.
+    //
+    // Note that removing a feature flag still requires the function which tests for the feature
+    // (like `code_dependency_check_enabled` below) to stay around for compatibility reasons, as it
+    // is a public function. However, once the feature flag is disabled, those functions can constantly
+    // return true.
+
+
+    // --------------------------------------------------------------------------------------------
+    // Code Publishing
+
+    /// Whether validation of package dependencies is enabled, and the related native function is
+    /// available. This is needed because of introduction of a new native function.
+    /// Lifetime: transient
+    const CODE_DEPENDENCY_CHECK: u64 = 1;
+    public fun code_dependency_check_enabled(): bool acquires Features {
+        is_enabled(CODE_DEPENDENCY_CHECK)
+    }
+
+    /// Whether during upgrade compatibility checking, friend functions should be treated similar like
+    /// private functions.
+    /// Lifetime: ephemeral
+    const TREAT_FRIEND_AS_PRIVATE: u64 = 2;
+    public fun treat_friend_as_private(): bool acquires Features {
+        is_enabled(TREAT_FRIEND_AS_PRIVATE)
+    }
+
+    // ============================================================================================
+    // Feature Flag Implementation
+
+    /// The provided signer has not a framework address.
+    const EFRAMEWORK_SIGNER_NEEDED: u64 = 1;
+
+    /// The enabled features, represented by a bitset stored on chain.
+    struct Features has key {
+        features: vector<u8>,
+    }
+
+    /// Function to enable and disable features. Can only be called by a signer of @std.
+    public fun change_feature_flags(framework: &signer, enable: vector<u64>, disable: vector<u64>)
+    acquires Features {
+        assert!(signer::address_of(framework) == @std, error::permission_denied(EFRAMEWORK_SIGNER_NEEDED));
+        if (!exists<Features>(@std)) {
+            move_to<Features>(framework, Features{features: vector[]})
+        };
+        let features = &mut borrow_global_mut<Features>(@std).features;
+        let i = 0;
+        let n = vector::length(&enable);
+        while (i < n) {
+            set(features, *vector::borrow(&enable, i), true);
+            i = i + 1
+        };
+        let i = 0;
+        let n = vector::length(&disable);
+        while (i < n) {
+            set(features, *vector::borrow(&disable, i), false);
+            i = i + 1
+        };
+    }
+
+    /// Check whether the feature is enabled.
+    fun is_enabled(feature: u64): bool acquires Features {
+        exists<Features>(@std) &&
+        contains(&borrow_global<Features>(@std).features, feature)
+    }
+
+    /// Helper to include or exclude a feature flag.
+    fun set(features: &mut vector<u8>, feature: u64, include: bool) {
+        let byte_index = feature / 8;
+        let bit_mask = 1 << ((feature % 8) as u8);
+        while (vector::length(features) <= byte_index) {
+            vector::push_back(features, 0)
+        };
+        let entry = vector::borrow_mut(features, byte_index);
+        if (include)
+            *entry = *entry | bit_mask
+        else
+            *entry = *entry & (0xff ^ bit_mask)
+    }
+
+    /// Helper to check whether a feature flag is enabled.
+    fun contains(features: &vector<u8>, feature: u64): bool {
+        let byte_index = feature / 8;
+        let bit_mask = 1 << ((feature % 8) as u8);
+        byte_index < vector::length(features) && (*vector::borrow(features, byte_index) & bit_mask) != 0
+    }
+
+    #[test]
+    fun test_feature_sets() {
+        let features = vector[];
+        set(&mut features, 1, true);
+        set(&mut features, 5, true);
+        set(&mut features, 17, true);
+        set(&mut features, 23, true);
+        assert!(contains(&features, 1), 0);
+        assert!(contains(&features, 5), 1);
+        assert!(contains(&features, 17), 2);
+        assert!(contains(&features, 23), 3);
+        set(&mut features, 5, false);
+        set(&mut features, 17, false);
+        assert!(contains(&features, 1), 0);
+        assert!(!contains(&features, 5), 1);
+        assert!(!contains(&features, 17), 2);
+        assert!(contains(&features, 23), 3);
+    }
+
+    #[test(fx = @std)]
+    fun test_change_feature_txn(fx: signer) acquires Features {
+        change_feature_flags(&fx, vector[1, 9, 23], vector[]);
+        assert!(is_enabled(1), 1);
+        assert!(is_enabled(9), 2);
+        assert!(is_enabled(23), 3);
+        change_feature_flags(&fx, vector[17], vector[9]);
+        assert!(is_enabled(1), 1);
+        assert!(!is_enabled(9), 2);
+        assert!(is_enabled(17), 3);
+        assert!(is_enabled(23), 4);
+    }
+}
diff --git a/aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib_incompat/sources/configs/features.spec.move b/aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib_incompat/sources/configs/features.spec.move
new file mode 100644
index 0000000000000..c5dd8e17f50bb
--- /dev/null
+++ b/aptos-move/e2e-move-tests/tests/code_publishing.data/pack_stdlib_incompat/sources/configs/features.spec.move
@@ -0,0 +1,16 @@
+/// Maintains feature flags.
+spec std::features {
+    spec module {
+        pragma verify = false;
+    }
+
+    spec change_feature_flags {
+        pragma opaque = true;
+        modifies global<Features>(@std);
+    }
+
+    spec code_dependency_check_enabled {
+        pragma opaque = true;
+    }
+
+}
diff --git a/aptos-move/framework/aptos-framework/sources/code.move b/aptos-move/framework/aptos-framework/sources/code.move
index f288636e6ae25..0e9ac632ef636 100644
--- a/aptos-move/framework/aptos-framework/sources/code.move
+++ b/aptos-move/framework/aptos-framework/sources/code.move
@@ -4,8 +4,8 @@ module aptos_framework::code {
     use std::error;
     use std::signer;
     use std::vector;
+    use std::features;
 
-    use aptos_framework::features;
     use aptos_framework::util;
     use aptos_framework::system_addresses;
     use aptos_std::copyable_any::Any;
diff --git a/aptos-move/framework/move-stdlib/sources/configs/features.move b/aptos-move/framework/move-stdlib/sources/configs/features.move
new file mode 100644
index 0000000000000..fb58417f146da
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/sources/configs/features.move
@@ -0,0 +1,141 @@
+/// Defines feature flags for Aptos. Those are used in Aptos specific implementations of features in
+/// the Move stdlib, the Aptos stdlib, and the Aptos framework.
+module std::features {
+    use std::error;
+    use std::signer;
+    use std::vector;
+
+    // ============================================================================================
+    // Feature Flag Definitions
+
+    // Each feature flag should come with documentation which justifies the need of the flag.
+    // Introduction of a new feature flag requires approval of framework owners. Be frugal when
+    // introducing new feature flags, as too many can make it hard to understand the code.
+    //
+    // Each feature flag should come with a specification of a lifetime:
+    //
+    // - a *transient* feature flag is only needed until a related code rollout has happened. This
+    //   is typically associated with the introduction of new native Move functions, and is only used
+    //   from Move code. The owner of this feature is obliged to remove it once this can be done.
+    //
+    // - an *ephemeral* feature flag is required to stay around forever. Typically, those flags guard
+    //   behavior in native code, and the behavior with or without the feature need to be preserved
+    //   for playback.
+    //
+    // Note that removing a feature flag still requires the function which tests for the feature
+    // (like `code_dependency_check_enabled` below) to stay around for compatibility reasons, as it
+    // is a public function. However, once the feature flag is disabled, those functions can constantly
+    // return true.
+
+
+    // --------------------------------------------------------------------------------------------
+    // Code Publishing
+
+    /// Whether validation of package dependencies is enabled, and the related native function is
+    /// available. This is needed because of introduction of a new native function.
+    /// Lifetime: transient
+    const CODE_DEPENDENCY_CHECK: u64 = 1;
+    public fun code_dependency_check_enabled(): bool acquires Features {
+        is_enabled(CODE_DEPENDENCY_CHECK)
+    }
+
+    /// Whether during upgrade compatibility checking, friend functions should be treated similar like
+    /// private functions.
+    /// Lifetime: ephemeral
+    const TREAT_FRIEND_AS_PRIVATE: u64 = 2;
+    public fun treat_friend_as_private(): bool acquires Features {
+        is_enabled(TREAT_FRIEND_AS_PRIVATE)
+    }
+
+    // ============================================================================================
+    // Feature Flag Implementation
+
+    /// The provided signer has not a framework address.
+    const EFRAMEWORK_SIGNER_NEEDED: u64 = 1;
+
+    /// The enabled features, represented by a bitset stored on chain.
+    struct Features has key {
+        features: vector<u8>,
+    }
+
+    /// Function to enable and disable features. Can only be called by a signer of @std.
+    public fun change_feature_flags(framework: &signer, enable: vector<u64>, disable: vector<u64>)
+    acquires Features {
+        assert!(signer::address_of(framework) == @std, error::permission_denied(EFRAMEWORK_SIGNER_NEEDED));
+        if (!exists<Features>(@std)) {
+            move_to<Features>(framework, Features{features: vector[]})
+        };
+        let features = &mut borrow_global_mut<Features>(@std).features;
+        let i = 0;
+        let n = vector::length(&enable);
+        while (i < n) {
+            set(features, *vector::borrow(&enable, i), true);
+            i = i + 1
+        };
+        let i = 0;
+        let n = vector::length(&disable);
+        while (i < n) {
+            set(features, *vector::borrow(&disable, i), false);
+            i = i + 1
+        };
+    }
+
+    /// Check whether the feature is enabled.
+    fun is_enabled(feature: u64): bool acquires Features {
+        exists<Features>(@std) &&
+        contains(&borrow_global<Features>(@std).features, feature)
+    }
+
+    /// Helper to include or exclude a feature flag.
+    fun set(features: &mut vector<u8>, feature: u64, include: bool) {
+        let byte_index = feature / 8;
+        let bit_mask = 1 << ((feature % 8) as u8);
+        while (vector::length(features) <= byte_index) {
+            vector::push_back(features, 0)
+        };
+        let entry = vector::borrow_mut(features, byte_index);
+        if (include)
+            *entry = *entry | bit_mask
+        else
+            *entry = *entry & (0xff ^ bit_mask)
+    }
+
+    /// Helper to check whether a feature flag is enabled.
+    fun contains(features: &vector<u8>, feature: u64): bool {
+        let byte_index = feature / 8;
+        let bit_mask = 1 << ((feature % 8) as u8);
+        byte_index < vector::length(features) && (*vector::borrow(features, byte_index) & bit_mask) != 0
+    }
+
+    #[test]
+    fun test_feature_sets() {
+        let features = vector[];
+        set(&mut features, 1, true);
+        set(&mut features, 5, true);
+        set(&mut features, 17, true);
+        set(&mut features, 23, true);
+        assert!(contains(&features, 1), 0);
+        assert!(contains(&features, 5), 1);
+        assert!(contains(&features, 17), 2);
+        assert!(contains(&features, 23), 3);
+        set(&mut features, 5, false);
+        set(&mut features, 17, false);
+        assert!(contains(&features, 1), 0);
+        assert!(!contains(&features, 5), 1);
+        assert!(!contains(&features, 17), 2);
+        assert!(contains(&features, 23), 3);
+    }
+
+    #[test(fx = @std)]
+    fun test_change_feature_txn(fx: signer) acquires Features {
+        change_feature_flags(&fx, vector[1, 9, 23], vector[]);
+        assert!(is_enabled(1), 1);
+        assert!(is_enabled(9), 2);
+        assert!(is_enabled(23), 3);
+        change_feature_flags(&fx, vector[17], vector[9]);
+        assert!(is_enabled(1), 1);
+        assert!(!is_enabled(9), 2);
+        assert!(is_enabled(17), 3);
+        assert!(is_enabled(23), 4);
+    }
+}
diff --git a/aptos-move/framework/move-stdlib/sources/configs/features.spec.move b/aptos-move/framework/move-stdlib/sources/configs/features.spec.move
new file mode 100644
index 0000000000000..c5dd8e17f50bb
--- /dev/null
+++ b/aptos-move/framework/move-stdlib/sources/configs/features.spec.move
@@ -0,0 +1,16 @@
+/// Maintains feature flags.
+spec std::features {
+    spec module {
+        pragma verify = false;
+    }
+
+    spec change_feature_flags {
+        pragma opaque = true;
+        modifies global<Features>(@std);
+    }
+
+    spec code_dependency_check_enabled {
+        pragma opaque = true;
+    }
+
+}