Forgot to add the source file for the common utilities. My bad.
Merge remote-tracking branch 'upstream/LS1_Upgrade' into LS1_Upgrade