Visa when cruising Chinese ports

We are on a cruise this year. We board at Hong Kong and have stopovers at Shanghai and Tianjin, before heading to other countries. Would you please confirm that as long as we are on organised shore excursions and we are not planning excursions outside of the areas covered by the regulations, that the 15 day visa free regulation will apply to me as a non-Chinese tourist?

Thank you
Henry