Does overriding dependency properties work with VCS triggers?

I have a (simplified) setup of

Build A

•  Git VCS Root with repository name, default branch and branch filter all parameterized
•  Default Branch parameter (DefaultBranch) of "develop", branch filter parameter (BranchFilter) of 

                +:refs/heads/(master)
                +:refs/heads/(develop)
                +:refs/heads/feature/*
                +:refs/heads/(release/*)
                +:refs/heads/(hotfix/*)

            and a repository name parameter (RepoName) of "common.git"

Build B

• Git VCS Root with repository name, default branch and branch filter all parameterized
• Default Branch parameter (DefaultBranch) of "master", branch filter parameter (BranchFilter) of "+:refs/heads/(master)" and a repository name parameter (RepoName) of "example.git"
• Reverse dependency parameters for DefaultBranch, BranchFilter and RepoName using the same values as the standard parameters.
• VCS Trigger with branch filter of "+:master".
• Snapshot Dependency on Build A

If I run Build B manually and select the master branch in the "Changes" tab of the custom run dialogue or just click run and accept the <default> branch, everything works almost as expected. Build B queues against the master branch, Build A queues against a branch of "master;/example.git" (?) and both execute accessing the appropriate repository and master branch. This is the desired behaviour.

If I commit and push to example.git, the VCS trigger fires correctly and Build B queues against the master branch. However, Build A executes against its default values (develop branch in the common.git repo) and is labelled as such (develop).

Looking in Build A at the parameters passed to the build I can see that the reversed parameters appear to be set correctly. The only indication that something is wrong is that %teamcity.build.branch% is set to develop instead of master.

Is there something about builds being triggered rather than manually run which means the reverse.dep.<btID>.<property name> syntax doesn't work or doesn't get executed early enough?

Cheers, Pete