Merge "Adding a empty constructor so that the class can be emulated" into pi-dev