Bringing changes from main fork.