@khaledhosny Anyway, I think this can be merged as is.