ECE-482 Pull request to merge EC branch into Development branch.