Bug fixes
Merge commit '95e5ffdb4472df36f49021cdb687a28cd55d800e'