Suggested fix, along with minor comment updates and system test changes which allow the issue to be detected, is in the rt45545 branch, please review.