Cherry-pick MR1 to Master
This MR should only contain an added file "feature".
It is a bug that a newFile change is also contained in this MR.
This MR should only contain an added file "feature".
It is a bug that a newFile change is also contained in this MR.