Updated to use CMake's improved target commands.
Removed unneeded flag.
Merge remote-tracking branch 'origin/next' into drive_split
Initial work to remove storage template parameter (WIP).