Completed ticket cwrc-68 tasks.