Merge changes on testrtc branch to master