2021 Macbook pro keyboard and form factor vs 2019

Does anyone know if the 2021 MBP has the exact same keyboard as the 2019 MBP? I know that 2019 was a newer keyboard from the previous generation, but I'm wondering if there has been any further iteration on it.

Also, on the 2019 MBP, there is a rather sharp edge right where your wrist falls below the keyboard. Is that the same with the 2021 MBP? It always felt super uncomfortable to me!