my point was, that everything except those 2 changes have been already done in #456 
I'm not sure how to proceed now.. I guess you should remove everything done in #456 and merge the conflicting lines properly so pahimar can merge both without problems