Updated based on 5.2 compatibility findings from @alexkingorg