OPENUCB-346: Added remaining variables/dependencies and remove erroneous dependency on 'faq'.