Revert "Revert "Merge branch 'feature-idea'""

This reverts commit 0024c510619fb8d819553fc5d4bffcb15335f615.