LPS-39703, LPS-39780 - Also check for plugins
LPS-39703, LPS-39780 - Rename method
LPS-39703, LPS-39780 - Sort