NXP-11186: Locally synchronize a remotely renamed folder
Merge branches 'master' and '5.6.0' into 5.6.0