Feature/script not consumer - merge into master