merge master into FEATURE-NXP-10450-THUMBNAIL