Development to master merge.

It's not a mistake to have same named ids in different layouts.