Pulling mandatory dialog changes into branch