merge from hintss