[[ Bugfix 13121 ]] Added some TODO comments