FL - Update Rev Code, and some simple cleanup
Merge commit 'e304ff92ccff28feed69179b6c5efd23f903bf3a' into Dev
FL - Update Rev Code, and some simple cleanup