rc: merged markup stuff