These changes are cherry-picked from DAR-2922_DAR-2908_DAR-2903 21cc5f2  
Maybe there is the proper place to address the change.