Updated Master branch to F3 3-0-8 (dev)