Dev latest fixes for Plugin branch.