Initial commit of master branch.

Based on modified F3 3-0-8 (dev)