Merge "BUG-650: speedup getSubtransaction()"