some fixes
Merge origin/ardfo into ardfo