Merge 12.0 nightly changes

Signed-off-by: neobuddy89 <neobuddy89@gmail.com>