V3.24.1 03

Creating this branch so that the merge requests are a little more cleaned up. I will provide suggestions to the repo for getting it through the pipeline. Feel free to post any questions or concerns on here or via email.