bugFix #Sig656
Merge remote-tracking branch 'origin/test' into dev