Merge "[flexiglass] Introduces use of alignment lines." into main