4.3 changes for quincy-common