Merge remote-tracking branch 'origin/basop_issue_2586' into basop_issue_2586