Huge pull from QReal/Updater development branch