Story update, fixes
Merge commit '0bae7284e550aa2c609ec7eedd4b475b385c9456' into develop