Merging Pull Request to Shortcode Listing Category branch