Ported AOI widget and plugins from destination branch