Merge "Added forward declaration for compilation"