Added recording in progress check
Merge