Merges changes in release/4.3 back into develop

cc @sendhil @roundhill @bummytime @irbrad