[#RDOCAPP-23: added shortCode property and logic]