prepare for another shortcode

Change-Id: Ic17faff40d00dae3c6aa91770ac7dbbb2f6bca92