Merge pull request #4984 from esenapaj/Small-fix-for-PR-#4980

Small fix for the PR #4980 (LIN_ADVANCE bug fix and optimization)