merge code with trunk
new ford variables
updating unit tests
project inline rename fix
fixing unit tests
merge