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 6a8ad40b057e6a7f0d3343ec06dbe487b352fe47)
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 6a8ad40b057e6a7f0d3343ec06dbe487b352fe47)