Making drug management feature configurable
Merge branch 'development' into all_branches