Refs #8449 Cmakefile commented until I figure out the error
Merge branch 'feature/8449_sassena_stamp_removal' into develop