Pulling in changes from core and double-entry