commits from leffe/40