Testing plugin load fix
Merge branches 'master' and 'fix_load_bug'