Merge master into states-for-additional-error-handling