Merging changes from community repo