fixes in feedback
Merge origin/ardfo into ardfo