Removed on_hand
Merge branch 'fix-removed-pref' into develop