Merge branch 'jejb-fixes' into fixes