[18082014] - Check master after merge bs branch]