Merge "Revert "Class: Make status 64-bit field""