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

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