Merge remote-tracking branch 'jkacur/rt-tests-0.83-devel' into work