aligned with (pending) -06 release