Merge branch 'rt-55953-readdir' into master