merge in master-release history after reset to d8698d739f68a201d272d2b8cc3c3ab0ad3f621b