Updating to latest fw1
Merge branch 'develop'