Merge "Implement System Properties Section"