919561: cleaned up and documented changes