* fix amc issues
Merge branch 'origin/devel'