LOTRP-246, 253, 270, 298, 299
Merge pull request #29 from mradko/RELEASE-3.1-LOT

LOTRP-246, 253, 270, 298, 299