Merge & Config Changes for demo