Resolve "Update Features for DevOps Lifecycle"

Merged William Chia requested to merge 1682-update-features-for-devops-lifecycle into master