NXP-10782 - better regexp
NXP-10782 - better regexp