READ-104 hijacking fix
Merge remote-tracking branch 'origin/0.5.0-bookshare' into 0.5.0-bookshare