added inherit doc block and task number
merge