merging changes from av3-fc