:white_check_mark: login: lithorus / name: Jimmy Christensen (89a177c45eb3b46ca3a41c69f9958f150226588a, a97d993b9589af886ce0cd9298c9f15b02477009)
:white_check_mark: login: DiegoTavares / name: Diego Tavares (dfd8ad56e106edd9aab2723e38111db380ab183d)
:x: The email address for the commit (5f6a48ea88d334d69e71fad6d4a78b6e24baf036, 9e85fe0cce760f950098d2c7a5509a58e3442db6, fb8c00d0293c36556f985fb1d2a57f23f0d10a77) is not linked to the GitHub account, preventing the EasyCLA check. Consult this Help Article and GitHub Help to resolve. (To view the commit's email address, add .patch at the end of this PR page's URL.) For further assistance with EasyCLA, please submit a support request ticket.
Link the Issue(s) this Pull Request is related to. This is the missing merge from #1284
Summarize your change. Merged and updated to recent changes.