merge changes from cmosetick/Docker-RRO