Feature/pending activation