PM-366 add optional source to transaction
PM-369 :fixed inconsistency of return