Reopening MR !299 . Due to huge commit history, Rebasing the previous branch would be really painful.