Adding fixes for movement of items
Merge remote-tracking branch 'origin/path-enumeration'