Testing merge from master to see if I have less issues with having to rebase the commit