Merge latest BV changes