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