Merging Nova branch code with the Master branch