Fix #386: JVET-O0272 with alignment between SW and text and one corner case bug fixed See merge request !733