Merge branch 'firefly' into squashCM