backported the short function inclusion