Merge remote branch 'martins/scriptstatus'