Bug Fix Description: The fix I put in on Friday wasn't working properly. Solution: Changed some single quotes to double quotes so that the macros are expanded and set "command_finalize" to the newest values I created. Platforms tested: Modi4