merge code aurora changes