2014.08: back ported changes from oldpatricka develop PR