cleanup timing
Merge branch 'refs/heads/dev' into dev_RPL