Changes for QA environment

@mpatnode-si