Merge "sparate beans and repositories"