[TIMOB-13827] Manual cherry-pick
[TIMOB-13827] Bug fix
Merge pull request #130 from bryan-m-hughes/timob-13827-1_1_X

[TIMOB-13827-1_1_X] Added code processor hook