merging from dev_pasdk_frank