Merge "BUG-731: eliminate magic constants"