Merged in various changes made in 2.6 plugin