* also updated text to be 'plugin friendly' vs hardcoding modules (cherry picked from commit 341a0f7b035588557d35fc12164a0f4031c786fe)