11 Commits (fix-1114-patch)