[SP-1218]: Align new shims with project revision
Merge pull request #216 from mattyb149/SP-1218-5.0.6

[SP-1218]: Align new shims with project revision