Merge commit '2f21254fc906a2f3ef7ac7b614f40096d590d58d'
Conflicts: project/device_79f8e1cd/79f8e1cd749a4ec3a6a4ad5ef544776c.object
Authored by: pcpojawa 2022-09-21
Parents: [2f2125][f6b4e4]
