The circular flag should be considered here. Please create a ticket to do this separately.