Shares support
Merge commit 'e3cd7db4ca4e3d094535482a81735a1c3cccf7b8' into feature/keystone