Merge remote-tracking branch 'eg-working/user/berick/hold-current-shelf-lib'