Latest changes; mostly committing to pull changes by Vikentiy