Merged latest from plugin boilerplate