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