Signed-off-by: Nicholas Smith <nicholas@nbembedded.com> [squash commits, fix whitespace] Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 114dc38dc2ce82a9f32fdc16adaa6f435ee36881)
Signed-off-by: Nicholas Smith <nicholas@nbembedded.com> [squash commits, fix whitespace] Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 114dc38dc2ce82a9f32fdc16adaa6f435ee36881)