Merge "Compilation fix: N-MR1 merge"