forward port
Merge pull request #276 from Incubaid/ARAKOON-449_for_1.7

forward port