"Updates/Testing git from ST3"
Updates and changes.