Merged changes of D850