STANDARD UPDATES MERGE
STANDARD FIXES