Merge "resolved conflicts for merge of 6edef668 to master"