Doc changes for feature changes 1544 and 1557