Fix composer.lock issue with besimple
Merge branch 'master' into PIM-1266