Initial commit from aimes repository, bundle-devel branch