Merge branch 'sh/plugin_interval'