Merge branch 'skypher-chirbit'