Bring latest from development into compression branch