Merge branch 'mntechnique-show_address_in_online_pos' into develop