Merge "Adding zen dialog in zen settings"