Pull request for some commits

I hereby commit these commits to the commit room of commits.