additonal 1.15 changes