Merge "Reduce the usage of widerlpf" into experimental