Merge cleanup and improvement fixes from ST3