Adding fixes from master to nei branch by creating a new commit