bay12 ZAS merge