Merge branch 'dev-mini2440-staging' into dev-mini2440-buserror