Merge "New shortcodes to safelist (Q2 2020)" into rvc-dev