Merge branch 'bug_689_projectx_subs' into experimental