Updates for t3046 landing on master