Just reporting back, 7.16 beta fixed this. Thanks Khaled!