Changed ordering of cleanup to prevent assertion in debug builds
Changed ordering of cleanup to prevent assertion in debug builds

zepheira/amara,zepheira/amara,zepheira/amara,zepheira/amara,zepheira/amara,zepheira/amara