Revert "Revert "Important commit 10-24""

This reverts commit 7e70b56a16c90b27b61605c534288aa1af9beb1e.