Merge "dequant invoke macro removal" into experimental