adding demo content ported from mainline