simplify code
Merge branch 'master' into NXP-4803-db-uuid