Updates 24.08.2014: ticket 0001131 fix without complete review