Merge "resolved conflicts for 5d7b68d4 to master"