Merge fix. Resource Packer update.