The problem in NXP-24920 also exists in LTS 2017, please backport.
NXP-24920 Partial deploy generic directory component