Merge "Compilation issue fix"