merging master into albert_robot - trying to resolve conflicts