Merge attention, displayOnly and Baseline to master