merge from lucky83 pull 3