Restore lost changes

I do not know why but I had very seriose conflict when try to push some
changes through GitHub for MAC. I spent sometime to make it through but
since I am not git expert it happen that last to PR merges was lost. I
restore it manually.