Adopt changes made earlier to new improvements branch