Refactored put mapping api to make use of the new recently introduced generic ack mechanism

Closes #4228