Pull from master & several modifications