First attempt for 1.20 build