Merge "Adjust samples output pages." into klp-dev