handmade merge related #7