Merge library-ejb/master