Master branch with no-data value fix from devel only