Tom is actually a single commit https://github.com/simod/geonode/commit/0e9d8851cc083bda8cc7977e1ea082b13d7fc043
do you want a single PR?