Merge "Fixed Blocker issues. IssueId: SO-165"