hall branch commit

approved