Merge "Added highlighted background support" into main