Merge branch 'am5748-fix' into fixes