Commit to fir for locking issue (and hopefully that explains part of this JIRA bug as well)