Added another condition on submodule
Merge branch 'local_master'