I'm sure it is but I will double check on 2.0 branch with these commits added and ping you