[#RPLYTOAPP-9: Separate common behavior]
[#RPLYTOAPP-9: Separate instance as common]
[#ENGINE-27: added shortcode fixes]