Merge reservlogic into master