take in changes from maintenance release 0.11.11.5