Merging chipola-new-v2 into the proper branch