This change has been merged to all branches, gitlab merge requests 7 and 59.