Comment 21 for bug 486284

Created an attachment (id=390343)
v.2 inline function & update unit tests