Merge "Add visibility to Status functions and variables"