Merge commit '65da72b795c3052be21d9369897292bd4f0f0d12' into bootloader-update