latest changes for Oasis-47 and Oasis-64