XCOMMONS-568: Save status file only if valid
* fix merge