Merge fsl-maintain branch

Signed-off-by: Jeff Horn <jhorn@reachtech.com>