finally merge redoProperties into master