Merge commit '0.99.2'