Feature/aj 3657 custom plugins