Bugfixes
Merge commit '8dcb75fe5bc2446cb87657e118eb83ee37bb5ed9'