Revert "Revert "140707_Base""

This reverts commit a1a9c0ec7da138ed3b240d0a1846c1dca404f949.